Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 05:55:36 +0000 (22:55 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 05:55:36 +0000 (22:55 -0700)

Trivial merge